projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b1cfdb3 29fffbd)
Merge from origin/emacs-28
authorStefan Kangas <stefan@marxist.se>
Thu, 23 Dec 2021 05:31:26 +0000 (06:31 +0100)
committerStefan Kangas <stefan@marxist.se>
Thu, 23 Dec 2021 05:31:26 +0000 (06:31 +0100)
commitbe38405b1f5309c14668510ccc7c1306f399de6e
tree8550f374f09e09b18f2e7b3a53a2fe8a8d011fa8tree | snapshot
parentb1cfdb3573facdceae3785478c62c2e2548564eccommit | diff
parent29fffbdd87391272e9131be63cf93f5067d6ae0dcommit | diff
Merge from origin/emacs-28

29fffbdd87 Revert field-related thingatpt changes
9bcb732686 * lisp/window.el (quit-restore-window): Select previously ...
b7d31d6192 Revert "Remove Motif support"

# Conflicts:
# etc/NEWS
configure.ac diff1 | diff2 | blob | history
etc/NEWS.28 diff1 | | blob | history
lisp/thingatpt.el diff1 | diff2 | blob | history
lisp/window.el diff1 | diff2 | blob | history
test/lisp/thingatpt-tests.el diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.